Initial updates for new layout refactoring
iOS: Finish updating for new layout changes, and share more code from Mac platform