Wrote a custom view controller
Merged changes for custom-view-controller