Consistency cleanup
Make notification container bigger
TMP COMMIT FOR ORG SUPPORT