Minor fixes in layouts