Refactored front-end templates