Fixed display problem and others