fix space & git merge formatting issue
added 3 buttons to bottom of page
Merge branch 'staging'