index udjusted
templates added
some helper classes