Added "add category" functionality, some restylings