Re-ordered and Updated Gui Class Diagram