safe point
some more modifications on ux