More work on iOS UI