More work done towards message saving and layout changes.