Fixed map rendering and added key events