GUI and keyb control improvements + cleanups