Fixed items order and new classes added