divided userbar and notifications
merge conflict
merge conflict