Minor layout improvements and fix for null values in address item