Bus toggle button text change + tidy up