Small tweaks to mode buttons