[DESIGN] Working on new template