Improved button placement