Clean-up

cleaned up comments and simplified addition of nav buttons.