Minor fixes in layout