Tweaking to fit the GUI