Some litte changes to Button behavior