Main button components on the Menu now have their own class