Changed buttons from individual views to living in superview
Merge branch 'master' of https://github.com/TBITracker/taskplanner