fixed address layout on labels so that it shows a gap between unit and a...

...dd num and also Unit keyword is displayed if there is a unit