Made units clickable