Changed layout and started working on menu