Bugfixes

Fixed several bugs that were introduced w/ the flyout navigation.