Added bootstrap grid to make forms

1. Switched the make forms to use boostrap grid.
2. Fixed some template inheritance bugs from the template re-organization.