#10, added error/success messages to the UI