added buttons and improved formatting