The UI reworked to be cleaner, better
Structure expectation message formatting improved