Merge pull request #4 from ajbtee/master

format fix
Merge pull request #5 from ajbtee/master

layout fixes
generic notification