changed name and added cancel button