Improved Button Spacing