Updated the UI and added backwards compat.