Improving tests
Improving template html
Adding bootstrap
Updating the bootstrap template