fixes in layout