Tweaking to fit GUI