Rework as UIViewController