We've decided to implement several of the changes recommended by the reviewing team. An updated class diagram is attached.
Firstly, we moved the draw functionality out of Graphics and into the objects to be drawn. Graphics had become a cluttered mess, and adding new objects would only add to the disarray. Now, each object draws itself, and Graphics merely calls a general draw() method which delegates to MenuHandler? and Game, which in turn delegate to the objects.
We've also added a gameObject class from which objects such as menuButton and toggle inherit. This will allow us to create new objects more easily, as we will undoubtedly have to do later in development.