tweaked uuid form and tidied up html
Merge branch 'dev'