done with initial template design