Refactor "second" menu to make it not invisibly cover navigation menu

Fixes #315