Made some minor changes, added logging to CategoriesPage
Merged down conflicts