Web ui fixes

ping @mperham 
Ah, I guess I could have cherry picked the commit.  Oh well.