Move error and success message to right place