Resolved some issues in display