adding all my changes to the GUI