fix mapping and enhance the viewing options