Added more button functionality