Change routes to include action, fix views