More button/layout tweaks.