Refactored arent maps view