Refactors some GUI classes, breaking certain aspects of code out into
different classes