Refactor to use superclass universal view controller