Improved button states