Fixed event messages layout again