Add new Navigation
Add generic Menu
Changed Layout