Added Data Display and button event handling