category reorder bugfix + others