some layout tweaks
message change
layout and messages