Fix displaying bugs