Changed layout
Merge conflicts resolved
changed the UI, added submenu