Fix arrows overlap
Fix arrow overlaping username