Danny Gonzalez
edited Bazaar screen and controller
Merge origin/master