Reverted more UI changes.