GUI fix try 1
GUI fix part 2