Added Active to button states

Needs further fixing in a different branch