Improved button support