Modified the GUI a bit
Merge branch 'GUI-Test'