Updated for slimming down the UI.