some cleanup and minor bug fixes
modify message and action templates to have sender on outer div