Simplified UI.  Should have done it ages ago.