Fix button grey outline issue, added active states to buttons for better click effect