bug fixes and added button alert
updated files