cleanup and adding nav, working on mobile friendly