GUI fix and shit