5.6.0. a few changes related to layout