Where's my egg?: Improve the design

Improve the design