Modified the structure. Added a menu