Some UI tweaks for the buttons, need to come up with something better later