Added tags for buttons and changed colors