Partial refactoring of the whole explorer area.
Merge pull request #1433 from diegosarmentero/master

Partial refactoring of the whole explorer area.