big update, added a new button and error/success messages