Improve window normal/vis mappings