Fixed: Spacing and link on units