Simplified classes, fixed an issue with active state, and added hover state to button