Added mouse control and markers