ui changes, fixed can method and calls