Template logic redesign
Menu redesigned