moved buttons pantry popup; removed code from main