ui fixes

Hi 

I have made the changes as mentioned.