Started to refactor UI to use ViewControllers