Clean up navigation menu, fix #129