added hover and active states, fixed other small issues