Alpha user notification settings

Merge notification settings into alpha