First category view fixes.