small ux improvments - testing version
ux enhancments emprovments v2