Changes to make the UIs consistent