Updated Map

Some UI Changes