Refactored templates with bootstrap3