Fixing some display bugs.