Misc Bug Fixes. Fixes category rendering. Fixes #4