Refactored JPanel, partially fixed keyListener