Allow filtering of the notices, a few organisation tweaks.