rough re-position of components
few other layout tweaks