Cleaned up placement of views in the ViewController.