Layout Refactoring, new template added