some fixes in layout