Refactor to xib