Added missing references and minor UI changes