prep branch for epside template redesign