iOS7 ui patches

Backport of PR #108 and PR #109