[DataBrowser] Some design fixes