Refactored Application form messages