Minor Changes to how Tabs function in the Main View.

Change-Id: I6f94a764a14e7d2fb9be4d96efcaa96a1f71771e