Renamed ViewController to HomeViewController. Modified UI on HomeViewController.
Fixed merge conflicts.