Fixed minor bugs
Added KeyEventListener
Removed unused imports