Added layout an template fields for messages table