Small button tweaks