Modified the GUI a bit