Add active state for buttons
fix widget pending state position