Small fixes in layouts