Updates to both categories and main view.
Removed some old if conditions.
Fixed categories list view forever refreshing indiciator