Refactored some more GUI elements to allow for large additions