Added error catcher.
Refactored view includes