frontend redesign / templates - push 3 of 6