Improvements for the layout and other fixes