Modularized the templates and polished the chrome.