Added address label and improved auto layout