Some fix in layout