more interface improvements, update for stable Xcode