#master: flash layout fix