Instance switcher enhancements
Refactor Styles
Reformat code
Fixup some lint