Move success message to the correct place