Fix notification
Fix views