categories functionality improvments

categories functionality improvments