Fix visual mappings (closes #8)