Some fixes in layouts