fixed address layout on labels so that it shows a gap between unit and add num and also Unit keyword is displayed if there is a unit