Add keyboard control, UI improvement