Fixed #1567

Moved the code diff control to the top of the list, and added a short
instructional message.