Improving main navigation
Minor changes