#master: PRE layout fix