UI changes, as suggested on may 10