Made message layout improvements and canvas changes