Pinki,Vinayak(Refactor UI)