Clean-up

cleaned up comments and simplified addition of nav buttons.
Merge pull request #1 from ajfarkas/clean-up

Clean-up