UI Work done 25/07/2014