Add nav bar and tidy up