Add buttons to allow re-ordering questions
Refactor to reduce some duplication