initial template redesign done