FIXED: mapping did not work in #if blocks, replaced with on the fly mapping
CLEANED-UP: CSS