Issue #22 Redesigned the Category loading