Button and tab tweaks