#master: layout fix