polish: move some html elements from xadmin to form.html
Merge pull request #2 from StuartLee/master

polish: move some html elements from xadmin to form.html