More button tweaks