Web ui fixes

ping @mperham 
You mean separate PR ? It already in different commit