*updating the design
*moved tags to the buttons themselves