toolbar has is own class now