Fix Tab Navigation in the Main App

[U-C-S]

[Jay-o-Way]

What/where exactly? My PR solves most of it, right?

[U-C-S]

Not sure about your PR in this case, Some cases it focuses on the stackpanel and other action less components in the browser selector window.

Also a further reminder to changes I want to make