Improvements in the layout!