Updated GuiContainer to remove redundancy