Bugfixing + Decor + Category ordering