Added container view controller
Code cleanup
Fixed outlets
Merge branch 'feature/refactor' into develop