frontend redesign / templates - push 2 of 3