Added buttons and tidied up a little