remove typo from button code and removed use case specific classes