additions to the layout
various fixes
fixed layout issues