UI hotkey updates

bunch of demo code changes too