reworked categories and implemented editing