Class refactor and UI updates to App Store