Added controls and map functionality