Tidy up content
Fix navigation