Added button functionality and info capture