Updated profile and completed 404s
Resolved conflict in app_controller