ee
Revert bfc7cd9..335ae1a

This rolls back to commit bfc7cd952b7812a46d093d22afecb14d24f51c55.
UI almost