updates to message handling; master layout formatting