Add message originator in template
Display messages in correct order
Prettify stuff