Attempted more UI fixing.

(This does not work though and will need to be rolled back to e08e27c903.)