It looks good to me. The Map function with the list is great.
I'm a programmer myself, and Users are always the same. They moan, moan, moan as soon as there's a change before they even give it a chance.
Come back in a few days/weeks once you have adjusted to the new site and moan then.