Add formatting + Separate messages_list and message helpers and templates.