Fixed valid product bug and toolbar functionality