z-index FTW!
Merge branch 'bug/presence-z-index' into development