[REFACTOR] Replaced span with div