Implement options
Move option checkboxes above result panel
Wrap options in a label
Merge branch 'options'