Partial refactoring of the whole explorer area.