some modifications in layout