Refactored buyer view