walking through vendor screens and fixing bugs
Merge pull request #109 from steffanc/vendor-bug-fixes

walking through vendor screens and fixing bugs