Revamped navigation menu
Fix #45