Buttons are prettier yay
fixed merge error