Display bugs fixed