ammended ui yesha
conflicts resolved