refactored app store layout