Add nav, links back to home
Clean up form