Design changes
Changes to the button states