Clean-up the new wish form

Just trying to line things up in a clean way -  comments?