Set of commits to tweak design on iOS emulator and iPhone