Main menu redesigned

Some options have been moved from the vertical
dropdown to the horizontal menu.