We should handle errors like this.
Minor fixes. New UI category for main view controller.