Moved message-tag inside the form