Implemented correct area mapping on the viewer.