Updated the view switcher, to keep the select input within the module.