formatted button placement, finished
Merge pull request #31 from tganyan/setup

formatted button placement, finished