Add modules and tabs logic to dashboard view

Now deals correctly with single module and tab dashboards requested by spotlight
Although, I don't think that should prevent this pull request being merged.