split notifications into two components refs #44