Nav working
Notes a little messed up
Theme in place
Merge branch 'theme_work'