Reworked Vendor to current approach, connected it to the menu
Also, restored Volunteer - please be careful with merging....