Move code around for cleaning
Fix z-index for viewers count