bout layout fixed
#master: 2.3.4