Simplified, made sidebar class list more flexible