Fixing issues with the updated UI.