Switch view now working and added color
Fixed commit