Added buttons and prettify