New Tweaks in layout