Fixed various bugs in Subject display.