deepak changes
updated minor Design issues Gaurav + Deepak