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