Refactored templates and made progress in design