Fixed a couple bugs with displaying messages