[OE-2738] removed old templates and implemented toby's redesign