Fixed minor bugs in non-manager display