cleanup + added size options for index items