several fixes in layouts