Move system gui elements to separate files as well