Remove few bugs and esthetics change.