Berlin 2014: Improve navigation.

Drop menu items that are no longer useful.
Merge pull request #1276 from jbraeuer/master

Berlin 2014: Improve navigation.