Fix for dataexplorer to entityexplorer link
Update data so name does not equal identifier
update grid/aggregate layout, code cleanup
Merge pull request #919 from dennishendriksen/master

Fix for dataexplorer to entityexplorer link + update grid/aggregate layout