Use scroll decorator in map layer selector

And also cleanup some commented out code when we are at it. :)