Added active state switcher, unified buttons with the 'button' CSS class.
Forgot to add the new files of the previous commit, they are in now.