Feature: Major redesign using standard template