Fixing display bugs