Finished category ordering + removed some redundant code + started edit category