Refactored templates, some style changes