changes to layout
improvements