Clean up
Added popup control window
Add keyboard control to the control window