Improves base View and Controller
Merge branch 'origin/master'
Improves controller hooks