Added formatting for buttons
Continued work