various improvements in the layout