Fixed the references in the UI