Cleanup GUI code 2

Signed-off-by: TheSniperFan <thesniperfan@gmail.com>