Further button changes

Added more active state fixes