Bootstrap-ify the form

Also, add some additional fields