Fixed the drawMap and added selector