Button update: UI tweaks, fixed switchTo/Name saving