Some tweaks to statusbar and gate buttons