Fix UX, also iOS7 transition