few Ui tweaks
few fixes