Updated ViewSwitch; Templates; Header