Fixed bugs in display