Wrangled the UI - its a little better