GUI streamlining and changes