Add messages to base template
Little changes requested by client