added proper categories rendering and generation