Hotfix layout navbar current_user
Merge branch 'develop'