Revert 90ff286..a415e6f

This rolls back to commit 90ff286566a84579fc6def235332d96202ba8d1f.
fixed the UI to use the same data as the engine