panorama: added more shapes and shape preview