Feature custom shapes

Custom Shape view change;
fixed some bugs.