Minor edits to GUI and Driver