A few tweaks to layout and button sizes