tweaks and cleaning up layouts;