Main: Cleanup of the main nav, now working relatively ok.