Finished requested Changes: Added buttons