Improved add annotation wizard