Some navigation tweaks
Commented out some unused code