Improved active button state