Changes for User image and some UI fixes, done by bala