Some minor rendering improvements.
Fixed merge conflicts.