Revert "Starting redesign of Classbars"

This reverts commit e8abb27a970d41d30a7b7c490c6093062fe00e0e.