add scroll and some map adjustments