Fixed navigation menu.

Quick fix of the main form navigation.
Daily Commit

Refactored navigation code