Unify Name implemented
added default border for button