Fixed errors in Message display