Added better formatting of buttons