Tidy up tab switcher
Fix some typos