Fix layout of data being displayed in lookup & minor UI modifications