Fixes #9

GUI Improvements