added success/error messages
moved around event function buttons