minor refactorings and bug fix for incorrect offer#show displays