Revert 4dad6b7..adb839e

This rolls back to commit 4dad6b7966097818b1046e121d02a500cc65bf2f.
Just a couple of ui tweaks, undo if you think we should