Add ordering and message display