Enter to submit

Wrapped the popup in a form for easier submit with enter-key
Merge

Merged history and master