Changed and improved the button active states