add basic form fields and twitter bootstrap
resolve merge conflicts to use the database information