Improve templates by using bootstrap