Revert "Merge branch 'Updated_Controllers'"

This reverts commit d69c89ea4f51095b7d4bb982970b4ad0e07d7163, reversing
changes made to 68d0d2769afcf802a252e179de2f861a3ebe611d.

Unmerged Updated Controllers branch.
Revert "Merge branch 'Updated_HAML_Views'"

This reverts commit 68d0d2769afcf802a252e179de2f861a3ebe611d, reversing
changes made to f680083ebff7bf72b0154e060031b0358bc211e6.

Reverts Updated_HAML_Views merg to master.