Reworked menu mechanism, fixed "bug" in product configuration