Fixed routes, updated views