Split up GUI a bit more