Layout refactoring for iPhone pt1