Refactored a bit the whole application + added choose number of selected material