Refactored AtlasPage