Update Routes
Refactor Model Spacing
Update Views