CSS fixes / map function
Revert "CSS fixes / map function"

This reverts commit b41ff6fa6b8ec460b809727c6efc1db7efd0aeaa.