Data explorer layout fixes
Merge pull request #1902 from dennishendriksen/master

Data explorer layout fixes