More additions to GUI and fixes to Model