improved spinner and code for map shapes