Comments
Rearraged buttons temporarily, guideline for later