UI
Revert 744d405..a68687e

This rolls back to commit 744d405925ed7bef5137e09f0977a42edfc3d707.