iOS 7 UI issues

Now I've rebased it, according to a comment which is now deleted...