fixed routing, changed location of views