Removed old navigation
Finshed with all the modules, now need testing.