Using routes instead of resources where relevant
Removing usage of modals
Cleanup
Fixing controller unittests