Done major rework to the Buttons class and the menus before play-state