Commented out buttons for now
Undid changes to views
Merge branch 'master' of https://github.com/limichaelc/PTX2