Fixed formatting
added new attributes to display messages