added name and button functionality