Added switch view, little chenges in urls