Updated controller syntax
Removed unused test classes (will add more later) and added one test :)
Removed unused form code
Updated views
Added sub name to relevant pages