Fixing display bugs
Fixing display bugs