More tweaks to buttons and more