UI update

Ben, 

Some UI changes.  Have only tested on mock data so please test before committing to GH and/or I can push to your instance?

Craig