Few more improvements in the layout