Switch highlighted tab when switching views via swipe

- Other cleanup