Updated templates. Dynamic data loading