Cleaned up navgation
Cleaned up navgation