Add new navigation
Rebuild the homepage
Remove excess code