Fixes in layout