Added DataView and filter, updated UI