minor adjustments - mostly on the layout