cleanup some categories, make few minor changes in ui