Refactor controls to be a bit more robust; still need to deal with KEYDOWN/KEYUP properly