Updated Expandable Categories to properly work in more situations