Notification presentation work
Merge remote-tracking branch 'origin/master'
HTML cleanup + new image integration