Re-align Buttons Fixes #7