diff --git a/mods/unified_inventory/api.lua b/mods/unified_inventory/api.lua
index 80946982..9de63ee5 100755
--- a/mods/unified_inventory/api.lua
+++ b/mods/unified_inventory/api.lua
@@ -1,4 +1,5 @@
 local S = unified_inventory.gettext
+local F = unified_inventory.fgettext
 
 -- Create detached creative inventory after loading all mods
 minetest.after(0.01, function()
@@ -56,6 +57,7 @@ minetest.after(0.01, function()
 	minetest.log("Unified Inventory. inventory size: "..unified_inventory.items_list_size)
 	for _, name in ipairs(unified_inventory.items_list) do
 		local def = minetest.registered_items[name]
+		-- Simple drops
 		if type(def.drop) == "string" then
 			local dstack = ItemStack(def.drop)
 			if not dstack:is_empty() and dstack:get_name() ~= name then
@@ -67,6 +69,79 @@ minetest.after(0.01, function()
 				})
 
 			end
+		-- Complex drops. Yes, it's really complex!
+		elseif type(def.drop) == "table" then
+			--[[ Extract single items from the table and save them into dedicated tables
+			to register them later, in order to avoid duplicates. These tables counts
+			the total number of guaranteed drops and drops by chance (“maybes”) for each item.
+			For “maybes”, the final count is the theoretical maximum number of items, not
+			neccessarily the actual drop count. ]]
+			local drop_guaranteed = {}
+			local drop_maybe = {}
+			-- This is for catching an obscure corner case: If the top items table has
+			-- only items with rarity = 1, but max_items is set, then only the first
+			-- max_items will be part of the drop, any later entries are logically
+			-- impossible, so this variable is for keeping track of this
+			local max_items_left = def.drop.max_items
+			-- For checking whether we still encountered only guaranteed only so far;
+			-- for the first “maybe” item it will become false which will cause ALL
+			-- later items to be considered “maybes”.
+			-- A common idiom is:
+			-- { max_items 1, { items = {
+			--	{ items={"example:1"}, rarity = 5 },
+			-- 	{ items={"example:2"}, rarity = 1 }, }}}
+			-- example:2 must be considered a “maybe” because max_items is set and it
+			-- appears after a “maybe”
+			local max_start = true
+			-- Let's iterate through the items madness!
+			if def.drop.items then
+				for i=1,#def.drop.items do
+					if max_items_left ~= nil and max_items_left <= 0 then break end
+					local itit = def.drop.items[i]
+					for j=1,#itit.items do
+						local dstack = ItemStack(itit.items[j])
+						if not dstack:is_empty() and dstack:get_name() ~= name then
+							local dname = dstack:get_name()
+							local dcount = dstack:get_count()
+							-- Guaranteed drops AND we are not yet in “maybe mode”
+							if #itit.items == 1 and itit.rarity == 1 and max_start then
+								if drop_guaranteed[dname] == nil then
+									drop_guaranteed[dname] = 0
+								end
+								drop_guaranteed[dname] = drop_guaranteed[dname] + dcount
+
+								if max_items_left ~= nil then
+									max_items_left = max_items_left - 1
+									if max_items_left <= 0 then break end
+								end
+							-- Drop was a “maybe”
+							else
+								if max_items_left ~= nil then max_start = false end
+								if drop_maybe[dname] == nil then
+									drop_maybe[dname] = 0
+								end
+								drop_maybe[dname] = drop_maybe[dname] + dcount
+							end
+						end
+					end
+				end
+			end
+			for itemstring, count in pairs(drop_guaranteed) do
+				unified_inventory.register_craft({
+					type = "digging",
+					items = {name},
+					output = itemstring .. " " .. count,
+					width = 0,
+				})
+			end
+			for itemstring, count in pairs(drop_maybe) do
+				unified_inventory.register_craft({
+					type = "digging_chance",
+					items = {name},
+					output = itemstring .. " " .. count,
+					width = 0,
+				})
+			end
 		end
 	end
 	for _, recipes in pairs(unified_inventory.crafts_for.recipe) do
@@ -170,7 +245,7 @@ end
 
 
 unified_inventory.register_craft_type("normal", {
-	description = "Crafting",
+	description = F("Crafting"),
 	icon = "ui_craftgrid_icon.png",
 	width = 3,
 	height = 3,
@@ -186,7 +261,7 @@ unified_inventory.register_craft_type("normal", {
 
 
 unified_inventory.register_craft_type("shapeless", {
-	description = "Mixing",
+	description = F("Mixing"),
 	icon = "ui_craftgrid_icon.png",
 	width = 3,
 	height = 3,
@@ -201,7 +276,7 @@ unified_inventory.register_craft_type("shapeless", {
 
 
 unified_inventory.register_craft_type("cooking", {
-	description = "Cooking",
+	description = F("Cooking"),
 	icon = "default_furnace_front.png",
 	width = 1,
 	height = 1,
@@ -209,12 +284,18 @@ unified_inventory.register_craft_type("cooking", {
 
 
 unified_inventory.register_craft_type("digging", {
-	description = "Digging",
+	description = F("Digging"),
 	icon = "default_tool_steelpick.png",
 	width = 1,
 	height = 1,
 })
 
+unified_inventory.register_craft_type("digging_chance", {
+	description = "Digging (by chance)",
+	icon = "default_tool_steelpick.png^[transformFY.png",
+	width = 1,
+	height = 1,
+})
 
 function unified_inventory.register_page(name, def)
 	unified_inventory.pages[name] = def
diff --git a/mods/unified_inventory/bags.lua b/mods/unified_inventory/bags.lua
index 377ffed3..ec3e95f7 100755
--- a/mods/unified_inventory/bags.lua
+++ b/mods/unified_inventory/bags.lua
@@ -4,16 +4,17 @@
 -- License: GPLv3
 
 local S = unified_inventory.gettext
+local F = unified_inventory.fgettext
 
 unified_inventory.register_page("bags", {
 	get_formspec = function(player)
 		local player_name = player:get_player_name()
 		local formspec = "background[0.06,0.99;7.92,7.52;ui_bags_main_form.png]"
-		formspec = formspec.."label[0,0;"..S("Bags").."]"
-		formspec = formspec.."button[0,2;2,0.5;bag1;Bag 1]" .. "button[0,3;2,0.5;unequip_bag1;Unequip]"
-		formspec = formspec.."button[2,2;2,0.5;bag2;Bag 2]" .. "button[2,3;2,0.5;unequip_bag2;Unequip]"
-		formspec = formspec.."button[4,2;2,0.5;bag3;Bag 3]" .. "button[4,3;2,0.5;unequip_bag3;Unequip]"
-		formspec = formspec.."button[6,2;2,0.5;bag4;Bag 4]" .. "button[6,3;2,0.5;unequip_bag4;Unequip]"
+		formspec = formspec.."label[0,0;"..F("Bags").."]"
+		formspec = formspec.."button[0,2;2,0.5;bag1;"..F("Bag 1").."]" .. "button[0,3;2,0.5;unequip_bag1;Unequip]"
+		formspec = formspec.."button[2,2;2,0.5;bag2;"..F("Bag 2").."]" .. "button[2,3;2,0.5;unequip_bag2;Unequip]"
+		formspec = formspec.."button[4,2;2,0.5;bag3;"..F("Bag 3").."]" .. "button[4,3;2,0.5;unequip_bag3;Unequip]"
+		formspec = formspec.."button[6,2;2,0.5;bag4;"..F("Bag 4").."]" .. "button[6,3;2,0.5;unequip_bag4;Unequip]"
 		formspec = formspec.."listcolors[#00000000;#00000000]"
 		formspec = formspec.."list[detached:"..minetest.formspec_escape(player_name).."_bags;bag1;0.5,1;1,1;]"
 		formspec = formspec.."list[detached:"..minetest.formspec_escape(player_name).."_bags;bag2;2.5,1;1,1;]"
@@ -37,7 +38,7 @@ unified_inventory.register_button("bags", {
 			local stack = player:get_inventory():get_stack("bag1", 1)
 			local image = stack:get_definition().inventory_image
 			local formspec = "image[7,0;1,1;"..image.."]"
-			formspec = formspec.."label[0,0;Bag 1]"
+			formspec = formspec.."label[0,0;"..F("Bag 1").."]"
 			formspec = formspec.."listcolors[#00000000;#00000000]"
 			formspec = formspec.."list[current_player;bag1contents;0,1;8,3;]"
 			formspec = formspec.."listring[current_name;bag1contents]"
@@ -58,7 +59,7 @@ unified_inventory.register_button("bags", {
 			local stack = player:get_inventory():get_stack("bag2", 1)
 			local image = stack:get_definition().inventory_image
 			local formspec = "image[7,0;1,1;"..image.."]"
-			formspec = formspec.."label[0,0;Bag 2]"
+			formspec = formspec.."label[0,0;"..F("Bag 2").."]"
 			formspec = formspec.."listcolors[#00000000;#00000000]"
 			formspec = formspec.."list[current_player;bag2contents;0,1;8,3;]"
 			formspec = formspec.."listring[current_name;bag2contents]"
@@ -79,7 +80,7 @@ unified_inventory.register_button("bags", {
 			local stack = player:get_inventory():get_stack("bag3", 1)
 			local image = stack:get_definition().inventory_image
 			local formspec = "image[7,0;1,1;"..image.."]"
-			formspec = formspec.."label[0,0;Bag 3]"
+			formspec = formspec.."label[0,0;"..F("Bag 3").."]"
 			formspec = formspec.."listcolors[#00000000;#00000000]"
 			formspec = formspec.."list[current_player;bag3contents;0,1;8,3;]"
 			formspec = formspec.."listring[current_name;bag3contents]"
@@ -100,7 +101,7 @@ unified_inventory.register_button("bags", {
 			local stack = player:get_inventory():get_stack("bag4", 1)
 			local image = stack:get_definition().inventory_image
 			local formspec = "image[7,0;1,1;"..image.."]"
-			formspec = formspec.."label[0,0;Bag 4]"
+			formspec = formspec.."label[0,0;"..F("Bag 4").."]"
 			formspec = formspec.."listcolors[#00000000;#00000000]"
 			formspec = formspec.."list[current_player;bag4contents;0,1;8,3;]"
 			formspec = formspec.."listring[current_name;bag4contents]"
@@ -232,7 +233,7 @@ for _, colour in pairs(colours) do
 			{"dye:"..colour,           "unified_inventory:bag_small"},
 		},
 	})
-	
+
 	minetest.register_craft({
 		output = "unified_inventory:bag_medium_" .. colour,
 		recipe = {
diff --git a/mods/unified_inventory/callbacks.lua b/mods/unified_inventory/callbacks.lua
index 42a5e240..fbe4d91f 100755
--- a/mods/unified_inventory/callbacks.lua
+++ b/mods/unified_inventory/callbacks.lua
@@ -130,6 +130,9 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
 			if string.sub(clicked_item, 1, 6) == "group:" then
 				minetest.sound_play("click", {to_player=player_name, gain = 0.1})
 				unified_inventory.apply_filter(player, clicked_item, new_dir)
+				unified_inventory.current_searchbox[player_name] = clicked_item
+				unified_inventory.set_inventory_formspec(player,
+					unified_inventory.current_page[player_name])
 				return
 			end
 			if new_dir == "recipe"
@@ -163,15 +166,21 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
 
 	if fields.searchbutton then
 		unified_inventory.apply_filter(player, unified_inventory.current_searchbox[player_name], "nochange")
-		unified_inventory.current_searchbox[player_name] = ""
 		unified_inventory.set_inventory_formspec(player,
 				unified_inventory.current_page[player_name])
 		minetest.sound_play("paperflip2",
 				{to_player=player_name, gain = 1.0})
+	elseif fields.searchresetbutton then
+		unified_inventory.apply_filter(player, "", "nochange")
+		unified_inventory.current_searchbox[player_name] = ""
+		unified_inventory.set_inventory_formspec(player,
+				unified_inventory.current_page[player_name])
+		minetest.sound_play("click",
+				{to_player=player_name, gain = 0.1})
 	end
 
-	-- alternate button
-	if not fields.alternate then
+	-- alternate buttons
+	if not (fields.alternate or fields.alternate_prev) then
 		return
 	end
 	minetest.sound_play("click",
@@ -188,12 +197,28 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
 	if alternates <= 1 then
 		return
 	end
-	local alternate = unified_inventory.alternate[player_name] + 1
-	if alternate > alternates then
-		alternate = 1
+	local alternate
+	if fields.alternate then
+		alternate = unified_inventory.alternate[player_name] + 1
+		if alternate > alternates then
+			alternate = 1
+		end
+	elseif fields.alternate_prev then
+		alternate = unified_inventory.alternate[player_name] - 1
+		if alternate < 1 then
+			alternate = alternates
+		end
 	end
 	unified_inventory.alternate[player_name] = alternate
 	unified_inventory.set_inventory_formspec(player,
 			unified_inventory.current_page[player_name])
 end)
 
+if minetest.delete_detached_inventory then
+	minetest.register_on_leaveplayer(function(player)
+		local player_name = player:get_player_name()
+		minetest.delete_detached_inventory(player_name.."_bags")
+		minetest.delete_detached_inventory(player_name.."craftrecipe")
+		minetest.delete_detached_inventory(player_name.."refill")
+	end)
+end
diff --git a/mods/unified_inventory/depends.txt b/mods/unified_inventory/depends.txt
index 7a6f9bd8..b4e6fcde 100755
--- a/mods/unified_inventory/depends.txt
+++ b/mods/unified_inventory/depends.txt
@@ -2,4 +2,4 @@ h2omes
 creative?
 intllib?
 datastorage?
-
+farming?
diff --git a/mods/unified_inventory/description.txt b/mods/unified_inventory/description.txt
new file mode 100644
index 00000000..b541fdf2
--- /dev/null
+++ b/mods/unified_inventory/description.txt
@@ -0,0 +1 @@
+Unified Inventory replaces the default survival and creative inventory. It adds a nicer interface and a number of features, such as a crafting guide.
diff --git a/mods/unified_inventory/group.lua b/mods/unified_inventory/group.lua
index 8fa632d5..43964902 100755
--- a/mods/unified_inventory/group.lua
+++ b/mods/unified_inventory/group.lua
@@ -1,3 +1,5 @@
+local S = unified_inventory.gettext
+
 function unified_inventory.canonical_item_spec_matcher(spec)
 	local specname = ItemStack(spec):get_name()
 	if specname:sub(1, 6) == "group:" then
@@ -21,9 +23,36 @@ function unified_inventory.item_matches_spec(item, spec)
 	return unified_inventory.canonical_item_spec_matcher(spec)(itemname)
 end
 
+function unified_inventory.extract_groupnames(groupname)
+	local specname = ItemStack(groupname):get_name()
+	if specname:sub(1, 6) == "group:" then
+		local group_names = specname:sub(7):split(",")
+		if #group_names == 1 then
+			return group_names[1], 1
+		end
+		local s = ""
+		for g=1,#group_names do
+			if g > 1 then
+				-- List connector
+				s = s .. S(" and ")
+			end
+			s = s .. group_names[g]
+		end
+		return s, #group_names
+	else
+		return nil, 0
+	end
+end
+
 unified_inventory.registered_group_items = {
 	mesecon_conductor_craftable = "mesecons:wire_00000000_off",
 	stone = "default:cobble",
+	wood = "default:wood",
+	book = "default:book",
+	sand = "default:sand",
+	leaves = "default:leaves",
+	tree = "default:tree",
+	vessel = "vessels:glass_bottle",
 	wool = "wool:white",
 	ingot = "default:steel_ingot",
 }
diff --git a/mods/unified_inventory/init.lua b/mods/unified_inventory/init.lua
index 00b66e03..aa2d9db5 100755
--- a/mods/unified_inventory/init.lua
+++ b/mods/unified_inventory/init.lua
@@ -2,6 +2,7 @@
 
 local modpath = minetest.get_modpath(minetest.get_current_modname())
 local worldpath = minetest.get_worldpath()
+local mygettext = rawget(_G, "intllib") and intllib.Getter() or function(s) return s end
 
 -- Data tables definitions
 unified_inventory = {
@@ -32,7 +33,8 @@ unified_inventory = {
 	default = "craft",
 
 	-- intllib
-	gettext = rawget(_G, "intllib") and intllib.Getter() or function(s) return s end,
+	gettext = mygettext,
+	fgettext = function(s) return minetest.formspec_escape(mygettext(s)) end,
 
 	-- "Lite" mode
 	lite_mode = minetest.setting_getbool("unified_inventory_lite"),
@@ -49,8 +51,9 @@ unified_inventory = {
 }
 
 -- Disable default creative inventory
-if rawget(_G, "creative_inventory") then
-	function creative_inventory.set_creative_formspec(player, start_i, pagenum)
+local creative = rawget(_G, "creative") or rawget(_G, "creative_inventory")
+if creative then
+	function creative.set_creative_formspec(player, start_i, pagenum)
 		return
 	end
 end
diff --git a/mods/unified_inventory/internal.lua b/mods/unified_inventory/internal.lua
index f3475423..80d7ef01 100755
--- a/mods/unified_inventory/internal.lua
+++ b/mods/unified_inventory/internal.lua
@@ -1,4 +1,5 @@
 local S = unified_inventory.gettext
+local F = unified_inventory.fgettext
 
 -- This pair of encoding functions is used where variable text must go in
 -- button names, where the text might contain formspec metacharacters.
@@ -136,11 +137,11 @@ function unified_inventory.get_formspec(player, page)
 
 	if not unified_inventory.hidden_guide[player_name] then --MFF crabman(29/11/2015) hide guide, textfield bug
 		formspec[n] = "image_button[13.2,0.1;.8,.8;ui_on_icon.png;hidebutton;]"
-				.. "tooltip[hidebutton;" ..S("Hide guide") .. "]"
+				.. "tooltip[hidebutton;" ..F("Hide guide") .. "]"
 		n = n+1
 	else
 		formspec[n] = "image_button[13.2,0.1;.8,.8;ui_off_icon.png;hidebutton;]"
-				.. "tooltip[hidebutton;" ..S("Show guide") .. "]"
+				.. "tooltip[hidebutton;" ..F("Show guide") .. "]"
 		return table.concat(formspec, "")
 	end
 
@@ -151,39 +152,39 @@ function unified_inventory.get_formspec(player, page)
 		formspec[n] =
 			"image_button[" .. (start_x + 0.6 * 0)
 				.. ",9;.8,.8;ui_skip_backward_icon.png;start_list;]"
-			.. "tooltip[start_list;" .. minetest.formspec_escape(S("First page")) .. "]"
+			.. "tooltip[start_list;" .. F("First page") .. "]"
 
 			.. "image_button[" .. (start_x + 0.6 * 1)
 				.. ",9;.8,.8;ui_doubleleft_icon.png;rewind3;]"
-			.. "tooltip[rewind3;" .. minetest.formspec_escape(S("Back three pages")) .. "]"
+			.. "tooltip[rewind3;" .. F("Back three pages") .. "]"
 			.. "image_button[" .. (start_x + 0.6 * 2)
 				.. ",9;.8,.8;ui_left_icon.png;rewind1;]"
-			.. "tooltip[rewind1;" .. minetest.formspec_escape(S("Back one page")) .. "]"
+			.. "tooltip[rewind1;" .. F("Back one page") .. "]"
 
 			.. "image_button[" .. (start_x + 0.6 * 3)
 				.. ",9;.8,.8;ui_right_icon.png;forward1;]"
-			.. "tooltip[forward1;" .. minetest.formspec_escape(S("Forward one page")) .. "]"
+			.. "tooltip[forward1;" .. F("Forward one page") .. "]"
 			.. "image_button[" .. (start_x + 0.6 * 4)
 				.. ",9;.8,.8;ui_doubleright_icon.png;forward3;]"
-			.. "tooltip[forward3;" .. minetest.formspec_escape(S("Forward three pages")) .. "]"
+			.. "tooltip[forward3;" .. F("Forward three pages") .. "]"
 
 			.. "image_button[" .. (start_x + 0.6 * 5)
 				.. ",9;.8,.8;ui_skip_forward_icon.png;end_list;]"
-			.. "tooltip[end_list;" .. minetest.formspec_escape(S("Last page")) .. "]"
+			.. "tooltip[end_list;" .. F("Last page") .. "]"
 	else
 		formspec[n] =
 			"image_button[" .. (8.2 + 0.65 * 0)
 				.. ",5.8;.8,.8;ui_skip_backward_icon.png;start_list;]"
-			.. "tooltip[start_list;" .. minetest.formspec_escape(S("First page")) .. "]"
+			.. "tooltip[start_list;" .. F("First page") .. "]"
 			.. "image_button[" .. (8.2 + 0.65 * 1)
 				.. ",5.8;.8,.8;ui_left_icon.png;rewind1;]"
-			.. "tooltip[rewind1;" .. minetest.formspec_escape(S("Back one page")) .. "]"
+			.. "tooltip[rewind1;" .. F("Back one page") .. "]"
 			.. "image_button[" .. (8.2 + 0.65 * 2)
 				.. ",5.8;.8,.8;ui_right_icon.png;forward1;]"
-			.. "tooltip[forward1;" .. minetest.formspec_escape(S("Forward one page")) .. "]"
+			.. "tooltip[forward1;" .. F("Forward one page") .. "]"
 			.. "image_button[" .. (8.2 + 0.65 * 3)
 				.. ",5.8;.8,.8;ui_skip_forward_icon.png;end_list;]"
-			.. "tooltip[end_list;" .. minetest.formspec_escape(S("Last page")) .. "]"
+			.. "tooltip[end_list;" .. F("Last page") .. "]"
 	end
 	n = n+1
 
@@ -193,14 +194,20 @@ function unified_inventory.get_formspec(player, page)
 		formspec[n] = "field[9.5,8.325;3,1;searchbox;;"
 			.. minetest.formspec_escape(unified_inventory.current_searchbox[player_name]) .. "]"
 		formspec[n+1] = "image_button[12.2,8.1;.8,.8;ui_search_icon.png;searchbutton;]"
-			.. "tooltip[searchbutton;" ..S("Search") .. "]"
+			.. "tooltip[searchbutton;" ..F("Search") .. "]"
+		formspec[n+2] = "image_button[12.9,8.1;.8,.8;ui_reset_icon.png;searchresetbutton;]"
+			.. "tooltip[searchbutton;" ..F("Search") .. "]"
+			.. "tooltip[searchresetbutton;" ..F("Reset search and display everything") .. "]"
 	else
 		formspec[n] = "field[8.5,5.225;2.2,1;searchbox;;"
 			.. minetest.formspec_escape(unified_inventory.current_searchbox[player_name]) .. "]"
 		formspec[n+1] = "image_button[10.3,5;.8,.8;ui_search_icon.png;searchbutton;]"
-			.. "tooltip[searchbutton;" ..S("Search") .. "]"
+			.. "tooltip[searchbutton;" ..F("Search") .. "]"
+		formspec[n+2] = "image_button[11,5;.8,.8;ui_reset_icon.png;searchresetbutton;]"
+			.. "tooltip[searchbutton;" ..F("Search") .. "]"
+			.. "tooltip[searchresetbutton;" ..F("Reset search and display everything") .. "]"
 	end
-	n = n+2
+	n = n+3
 
 	local no_matches = "No matching items"
 	if draw_lite_mode then
@@ -209,7 +216,7 @@ function unified_inventory.get_formspec(player, page)
 
 	-- Items list
 	if #unified_inventory.filtered_items_list[player_name] == 0 then
-		formspec[n] = "label[8.2,"..ui_peruser.form_header_y..";" .. S(no_matches) .. "]"
+		formspec[n] = "label[8.2,"..ui_peruser.form_header_y..";" .. F(no_matches) .. "]"
 	else
 		local dir = unified_inventory.active_search_direction[player_name]
 		local list_index = unified_inventory.current_index[player_name]
@@ -222,6 +229,18 @@ function unified_inventory.get_formspec(player, page)
 			for x = 0, ui_peruser.pagecols - 1 do
 				local name = unified_inventory.filtered_items_list[player_name][list_index]
 				if minetest.registered_items[name] then
+					-- Clicked on current item: Flip crafting direction
+					if name == unified_inventory.current_item[player_name] then
+						local cdir = unified_inventory.current_craft_direction[player_name]
+						if cdir == "recipe" then
+							dir = "usage"
+						elseif cdir == "usage" then
+							dir = "recipe"
+						end
+					else
+					-- Default: use active search direction by default
+						dir = unified_inventory.active_search_direction[player_name]
+					end
 					formspec[n] = "item_image_button["
 						..(8.2 + x * 0.7)..","
 						..(ui_peruser.formspec_y + ui_peruser.page_y + y * 0.7)..";.81,.81;"
@@ -232,13 +251,13 @@ function unified_inventory.get_formspec(player, page)
 				end
 			end
 		end
-		formspec[n] = "label[8.2,"..ui_peruser.form_header_y..";"..S("Page") .. ": "
+		formspec[n] = "label[8.2,"..ui_peruser.form_header_y..";"..F("Page") .. ": "
 			.. S("%s of %s"):format(page,pagemax).."]"
 	end
 	n= n+1
 
 	if unified_inventory.activefilter[player_name] ~= "" then
-		formspec[n] = "label[8.2,"..(ui_peruser.form_header_y + 0.4)..";" .. S("Filter") .. ":]"
+		formspec[n] = "label[8.2,"..(ui_peruser.form_header_y + 0.4)..";" .. F("Filter") .. ":]"
 		formspec[n+1] = "label[9.1,"..(ui_peruser.form_header_y + 0.4)..";"..minetest.formspec_escape(unified_inventory.activefilter[player_name]).."]"
 	end
 	return table.concat(formspec, "")
diff --git a/mods/unified_inventory/item_names.lua b/mods/unified_inventory/item_names.lua
index f6686dd3..5bc79c30 100755
--- a/mods/unified_inventory/item_names.lua
+++ b/mods/unified_inventory/item_names.lua
@@ -2,15 +2,19 @@
 
 local wield = {}
 local huds = {}
+local dtimes = {}
 local dlimit = 3  -- HUD element will be hidden after this many seconds
 local air_hud_mod = minetest.get_modpath("4air")
 local hud_mod = minetest.get_modpath("hud")
+local hudbars_mod = minetest.get_modpath("hudbars")
 
 local function set_hud(player)
 	local player_name = player:get_player_name()
 	local off = {x=0, y=-70}
 	if air_hud_mod or hud_mod then
 		off.y = off.y - 20
+	elseif hudbars_mod then
+		off.y = off.y + 5
 	end
 	huds[player_name] = player:hud_add({
 		hud_elem_type = "text",
@@ -24,24 +28,23 @@ end
 
 minetest.register_on_joinplayer(function(player)
 	minetest.after(0, set_hud, player)
-	minetest.after(dlimit, u_inv_hud_step, player:get_player_name())
 end)
 
-function u_inv_hud_step(name)
-	local p = minetest.get_player_by_name(name)
-	if not p then return end
-
-	p:hud_change(huds[name], 'text', "")
-	minetest.after(dlimit, u_inv_hud_step, name)
-end
-
 minetest.register_globalstep(function(dtime)
 	for _, player in pairs(minetest.get_connected_players()) do
 		local player_name = player:get_player_name()
 		local wstack = player:get_wielded_item():get_name()
 
+		if dtimes[player_name] and dtimes[player_name] < dlimit then
+			dtimes[player_name] = dtimes[player_name] + dtime
+			if dtimes[player_name] > dlimit and huds[player_name] then
+				player:hud_change(huds[player_name], 'text', "")
+			end
+		end
+
 		if wstack ~= wield[player_name] then
 			wield[player_name] = wstack
+			dtimes[player_name] = 0
 			if huds[player_name] then
 				local def = minetest.registered_items[wstack]
 				local desc = def and def.description or ""
diff --git a/mods/unified_inventory/locale/de.txt b/mods/unified_inventory/locale/de.txt
index d678b683..a2f7c3d1 100755
--- a/mods/unified_inventory/locale/de.txt
+++ b/mods/unified_inventory/locale/de.txt
@@ -1,71 +1,101 @@
 # Translation mostly by Xanthin
 
+### api.lua ###
+Digging (by chance) = Graben (durch Zufall)
+
 ### bags.lua ###
-Bags = Rucksaecke
-Bag 1 = Rucksack 1
-Bag 2 = Rucksack 2
-Bag 3 = Rucksack 3
-Bag 4 = Rucksack 4
-Small Bag = Rucksack (klein)
-Medium Bag = Rucksack (mittel)
-Large Bag = Rucksack (gross)
+Bags = Taschen
+Bag 1 = Tasche 1
+Bag 2 = Tasche 2
+Bag 3 = Tasche 3
+Bag 4 = Tasche 4
+Small Bag = Kleine Tasche
+Medium Bag = Mittelgroße Tasche
+Large Bag = Große Tasche
 
 ### inernal.lua ###
 First page = Erste Seite
-Back three pages = Drei Seiten zurueckblaettern
-Back one page = Eine Seiten zurueckblaettern
-Forward one page = Eine Seiten vorblaettern
-Forward three pages = Drei Seiten vorblaettern
+Back three pages = Drei Seiten zurueckblättern
+Back one page = Eine Seite zurueckblättern
+Forward one page = Eine Seite vorblättern
+Forward three pages = Drei Seiten vorblättern
 Last page = Letzte Seite
 No matching items = Keine passenden Gegenstände
 Page = Seite
 %s of %s = %s von %s
-Filter = Suche
+Filter = Filter
 Search = Suchen
+Reset search and display everything = Suche zurücksetzen und alles anzeigen
 
 ### register.lua ###
 Can use the creative inventory = Kann das Kreativinventar nutzen
-Home position set to: %s = Ausgangsposition nach: %s gesetzt
-Time of day set to 6am = Tageszeit auf 6 Uhr morgens geaendert
-You don't have the settime privilege! = Du hast nicht das "settime" Privileg!
-Time of day set to 9pm = Tageszeit auf 9 Uhr abends geaendert
-This button has been disabled outside of creative mode to prevent accidental inventory trashing. Use the trash slot instead. = Diese Funktion ist ausserhalb des Kreativmodus deaktiviert um ein versehentliches Loeschen des ganzen Inventars zu verhindern.\nNutze stattdessen das Muellfeld.
-Inventory Cleared! = Inventar geleert!
-Crafting = Bauen
-Trash: = Muell:
-Refill: = Nachfuellen:
-Crafting Guide = Bauanleitung
+Home position set to: %s = Heimatposition nach: %s gesetzt
+Time of day set to 6am = Tageszeit auf 6 Uhr geändert
+You don't have the settime privilege! = Du hast nicht das „settime“-Privileg!
+Time of day set to 9pm = Tageszeit auf 21 Uhr geändert
+This button has been disabled outside of creative mode to prevent accidental inventory trashing. Use the trash slot instead. = Diese Funktion ist außerhalb des Kreativmodus deaktiviert, um ein versehentliches Löschen des ganzen Inventars zu verhindern.\nNutze stattdessen das Müllfeld.
+Inventory cleared! = Inventar geleert!
+Crafting = Fertigung
+Digging = Graben
+Cooking = Kochen
+Mixing = Mischen
+Trash: = Müll:
+Refill: = Nachfüllen:
+Crafting Guide = Fertigungsführer
 Method: = Methode:
 Result: %s = Ergebnis: %s
 crafting = Bauen
-shapeless crafting = Formloses Bauen
+shapeless crafting = Formlose Fertigung
 cooking = Kochen
 alloy cooking = Legierung Kochen
-Copy to craft grid: = Kopiere ins Baufeld:
+Copy to craft grid: = Ins Fertigungsraster kopieren:
 All = Alles
-Recipe %s of %s = Rezept %s von %s
 Alternate = Alternative
-Crafting Grid =
+Crafting Grid = Fertigungsraster
+Show next recipe = Nächstes Rezept zeigen
+Show next usage = Nächste Verwendung zeigen
+Show previous recipe = Vorheriges Rezept zeigen
+Show previous usage = Vorherige Verwendung zeigen
+This recipe is too\nlarge to be displayed. = Dieses Rezept ist zu\ngroß, um angezeigt\nzu werden.
+Any item belonging to the %s group = Irgendein Gegenstand, der zur Gruppe %s gehört
+Any item belonging to the groups %s = Irgendein Gegenstand, der zu den Gruppen %s gehört
+Recipe %d of %d = Rezept %d von %d
+Usage %d of %d = Verwendung %d von %d
+No recipes = Keine Rezepte
+No usages = Keine Verwendungen
+Result = Ergebnis
+Ingredient = Zutat
+Set time to day = Zur Tageszeit wechseln
+Set time to night = Zur Nachtzeit wechseln
+Set home position = Heimatposition setzen
+Go home = Nach Hause gehen
+Clear inventory = Inventar leeren
+Give me: = Gib mir:
+To craft grid: = Ins Fertigungsraster:
+
+### group.lua ###
+\sand\s=\sund\s
 
 ### waypoints.lua ###
 White = Weiß
 Yellow = Gelb
 Red = Rot
-Green = Gruen
+Green = Grün
 Blue = Blau
-Waypoints = Markierungen
-Waypoint active = Markierung aktiv
-Waypoint inactive = Markierung inaktiv
-World position = Welt Position
-Name =
-HUD text color =
-Edit waypoint name = Name der Markierung aendern
-Rename waypoint = Markierung umbenennen
-Change color of waypoint display = Farbe der Darstellung der Markierung aendern
-Set waypoint to current location = Setze Markierung zur derzeitigen Position
-Make waypoint visible = Markierung sichtbar machen
-Make waypoint invisible = Markierung verstecken
-Disable display of waypoint coordinates =
-Enable display of waypoint coordinates =
-Finish editing =
-Select Waypoint #%d =
+Waypoints = Wegpunkte
+Waypoint %d = Wegpunkt Nr. %d
+Waypoint active = Wegpunkt aktiv
+Waypoint inactive = Wegpunkt inaktiv
+World position = Weltposition
+Name = Name
+HUD text color = HUD-Textfarbe
+Edit waypoint name = Name des Wegpunkts ändern
+Rename waypoint = Wegpunkt umbenennen
+Change color of waypoint display = Farbe der Darstellung der Wegpunkte ändern
+Set waypoint to current location = Setze Wegpunkt zur derzeitigen Position
+Make waypoint visible = Wegpunkt sichtbar machen
+Make waypoint invisible = Wegpunkt verstecken
+Disable display of waypoint coordinates = Anzeige der Wegpunktkoordinaten deaktivieren
+Enable display of waypoint coordinates = Anzeige der Wegpunktkoordinaten aktivieren
+Finish editing = Bearbeitung abschließen
+Select Waypoint #%d = Wegpunkt Nr. %d auswählen
diff --git a/mods/unified_inventory/locale/es.txt b/mods/unified_inventory/locale/es.txt
index 9382c79c..26508fbf 100755
--- a/mods/unified_inventory/locale/es.txt
+++ b/mods/unified_inventory/locale/es.txt
@@ -31,7 +31,7 @@ Time of day set to 6am = Hora del día cambiada a 6AM
 You don't have the settime priviledge! = ¡No tienes el privilegio `settime'!
 Time of day set to 9pm = Hora del día cambiada a 9PM
 This button has been disabled outside of creative mode to prevent accidental inventory trashing. Use the trash slot instead. = Éste botón ha sido deshabilitado para prevenir la destrucción accidental del inventario.\nUsa la ranura para basura en su lugar.
-Inventory Cleared! = ¡Inventario limpio!
+Inventory cleared! = ¡Inventario limpio!
 Crafting = Elaboración
 Trash: = Basura:
 Refill: = Rellenar:
diff --git a/mods/unified_inventory/locale/fr.txt b/mods/unified_inventory/locale/fr.txt
index 01e975e1..e4923a0b 100755
--- a/mods/unified_inventory/locale/fr.txt
+++ b/mods/unified_inventory/locale/fr.txt
@@ -31,7 +31,7 @@ Time of day set to 6am = Heure fixée à 6h
 You don't have the settime priviledge! = Vous n'avez pas le privilège 'settime' !
 Time of day set to 9pm = Heure fixée à 21h
 This button has been disabled outside of creative mode to prevent accidental inventory trashing.\nUse the trash slot instead. = Ce bouton a été désactivé en dehors du mode créatif pour éviter des saccages dans l'inventaire.\nUtilisez plutôt la case poubelle. 
-Inventory Cleared! = Inventaire vidé !
+Inventory cleared! = Inventaire vidé !
 Crafting = Création
 Trash: = Poubelle :
 Refill: = Remplir :
diff --git a/mods/unified_inventory/locale/pl.txt b/mods/unified_inventory/locale/pl.txt
index 33003d8d..6173a5f7 100755
--- a/mods/unified_inventory/locale/pl.txt
+++ b/mods/unified_inventory/locale/pl.txt
@@ -30,7 +30,7 @@ Time of day set to 6am = Czas ustawiony na 6:00
 You don't have the settime priviledge! = Nie masz uprawnien do zmiany czasu (settime)!
 Time of day set to 9pm = Czas ustawiony na 21:00
 This button has been disabled outside of creative mode to prevent accidental inventory trashing.\nUse the trash slot instead. = 
-Inventory Cleared! = 
+Inventory cleared! = 
 Crafting = 
 Trash: = Smietnik:
 Refill: = Uzupelnianie:
diff --git a/mods/unified_inventory/locale/ru.txt b/mods/unified_inventory/locale/ru.txt
index 19481554..821f2b18 100755
--- a/mods/unified_inventory/locale/ru.txt
+++ b/mods/unified_inventory/locale/ru.txt
@@ -31,7 +31,7 @@ Time of day set to 6am = Установлено время 6 утра
 You don't have the settime priviledge! = Вам не разрешено устанавливать время!
 Time of day set to 9pm = Установлено время 9 вечера
 This button has been disabled outside of creative mode to prevent accidental inventory trashing.\nUse the trash slot instead. = Эта кнопка отключена вне творческого режима, чтобы предотвратить случайное уничтожение предметов.\nИспользуйте слот корзины вместо нее.
-Inventory Cleared! = Инвентарь очищен!
+Inventory cleared! = Инвентарь очищен!
 Crafting = Крафт
 Trash: = Корзина:
 Refill: = Размножить:
diff --git a/mods/unified_inventory/locale/template.txt b/mods/unified_inventory/locale/template.txt
index ae382e32..bd27f2f7 100755
--- a/mods/unified_inventory/locale/template.txt
+++ b/mods/unified_inventory/locale/template.txt
@@ -1,5 +1,8 @@
 # Translation by
 
+### api.lua ###
+Digging (by chance) = 
+
 # Template
 ### bags.lua ###
 Bags = 
@@ -23,16 +26,21 @@ Page =
 %s of %s = 
 Filter = 
 Search = 
+Reset search and display everything = 
 
 ### register.lua ###
 Can use the creative inventory = 
+Forces Unified Inventory to be displayed in Full mode if Lite mode is configured globally =
 Home position set to: %s = 
 Time of day set to 6am = 
 You don't have the settime priviledge! = 
 Time of day set to 9pm = 
 This button has been disabled outside of creative mode to prevent accidental inventory trashing.\nUse the trash slot instead. = 
-Inventory Cleared! = 
+Inventory cleared! = 
 Crafting = 
+Digging = 
+Cooking = 
+Mixing = 
 Trash: = 
 Refill: = 
 Crafting Guide = 
@@ -44,9 +52,35 @@ cooking =
 alloy cooking = 
 Copy to craft grid: = 
 All = 
-Recipe %s of %s = 
 Alternate = 
 Crafting Grid =  
+Show next recipe = 
+Show next usage = 
+Show previous recipe = 
+Show previous usage = 
+# Shown for huge crafting recipes; try to keep the line length short and use multiple line breaks as needed
+This recipe is too\nlarge to be displayed. = 
+# %s = group name (e.g. wool)
+Any item belonging to the %s group = 
+# %s = List of “and”-concatenated group names
+Any item belonging to the groups %s =
+Recipe %d of %d = 
+Usage %d of %d = 
+No recipes =
+No usages =
+Result =
+Ingredient =
+Set time to day =
+Set time to night =
+Set home position =
+Go home =
+Clear inventory =
+Give me: =
+To craft grid: =
+
+### group.lua ###
+# Logical connective, example: “Any item belonging to the groups foo and bar”
+\sand\s = 
 
 ### waypoints.lua ###
 White = 
@@ -55,6 +89,7 @@ Red =
 Green = 
 Blue = 
 Waypoints = 
+Waypoint %d = 
 Waypoint active = 
 Waypoint inactive = 
 World position = 
diff --git a/mods/unified_inventory/locale/tr.txt b/mods/unified_inventory/locale/tr.txt
index c1d3207b..138e66cc 100755
--- a/mods/unified_inventory/locale/tr.txt
+++ b/mods/unified_inventory/locale/tr.txt
@@ -31,7 +31,7 @@ Time of day set to 6am = Saat 06:00 olarak ayarlandı
 You don't have the settime priviledge = Saati düzenleme yetkiniz yok! 
 Time of day set to 9pm = Saat 19:00 olarak ayarlandı 
 This button has been disabled outside of creative mode to prevent accidental inventory trashing.\nUse the trash slot instead. = Yaratıcı modu dışında iken bu tuş kullanılamaz. 
-Inventory Cleared! = Envanter temizlendi! 
+Inventory cleared! = Envanter temizlendi! 
 Crafting = Üretim
 Trash: = Çöp
 Refill: = Doldur
diff --git a/mods/unified_inventory/mod.conf b/mods/unified_inventory/mod.conf
new file mode 100644
index 00000000..26a8af6b
--- /dev/null
+++ b/mods/unified_inventory/mod.conf
@@ -0,0 +1 @@
+name = unified_inventory
diff --git a/mods/unified_inventory/register.lua b/mods/unified_inventory/register.lua
index 6bb7285a..344f3892 100755
--- a/mods/unified_inventory/register.lua
+++ b/mods/unified_inventory/register.lua
@@ -1,12 +1,13 @@
 local S = unified_inventory.gettext
+local F = unified_inventory.fgettext
 
 minetest.register_privilege("creative", {
-	description = "Can use the creative inventory",
+	description = S("Can use the creative inventory"),
 	give_to_singleplayer = false,
 })
 
 minetest.register_privilege("ui_full", {
-	description = "Forces UI to display in Full mode when Lite mode is configured globally",
+	description = S("Forces Unified Inventory to be displayed in Full mode if Lite mode is configured globally"),
 	give_to_singleplayer = false,
 })
 
@@ -56,9 +57,6 @@ unified_inventory.register_button("home_gui_set", {
 		end,
 })
 
-
-
-
 unified_inventory.register_button("home_gui_go", {
 	type = "image",
 	image = "ui_gohome_icon.png",
@@ -155,7 +153,7 @@ unified_inventory.register_button("clear_inv", {
 			return
 		end
 		player:get_inventory():set_list("main", {})
-		minetest.chat_send_player(player_name, 'Inventory Cleared!')
+		minetest.chat_send_player(player_name, S('Inventory cleared!'))
 		minetest.sound_play("trash_all",
 				{to_player=player_name, gain = 1.0})
 	end,
@@ -170,16 +168,16 @@ unified_inventory.register_page("craft", {
 		local player_name = player:get_player_name()
 		local formspec = "background[2,"..formspecy..";6,3;ui_crafting_form.png]"
 		formspec = formspec.."background[0,"..(formspecy + 3.5)..";8,4;ui_main_inventory.png]"
-		formspec = formspec.."label[0,"..formheadery..";Crafting]"
+		formspec = formspec.."label[0,"..formheadery..";" ..F("Crafting").."]"
 		formspec = formspec.."listcolors[#00000000;#00000000]"
 		formspec = formspec.."list[current_player;craftpreview;6,"..formspecy..";1,1;]"
 		formspec = formspec.."list[current_player;craft;2,"..formspecy..";3,3;]"
-		formspec = formspec.."label[7,"..(formspecy + 1.5)..";" .. S("Trash:") .. "]"
+		formspec = formspec.."label[7,"..(formspecy + 1.5)..";" .. F("Trash:") .. "]"
 		formspec = formspec.."list[detached:trash;main;7,"..(formspecy + 2)..";1,1;]"
 		formspec = formspec.."listring[current_name;craft]"
 		formspec = formspec.."listring[current_player;main]"
 		if unified_inventory.is_creative(player_name) then
-			formspec = formspec.."label[0,"..(formspecy + 1.5)..";" .. S("Refill:") .. "]"
+			formspec = formspec.."label[0,"..(formspecy + 1.5)..";" .. F("Refill:") .. "]"
 			formspec = formspec.."list[detached:"..minetest.formspec_escape(player_name).."refill;main;0,"..(formspecy +2)..";1,1;]"
 		end
 		return {formspec=formspec}
@@ -188,11 +186,6 @@ unified_inventory.register_page("craft", {
 
 -- stack_image_button(): generate a form button displaying a stack of items
 --
--- Normally a simple item_image_button[] is used.  If the stack contains
--- more than one item, item_image_button[] doesn't have an option to
--- display an item count in the way that an inventory slot does, so
--- we have to fake it using the label facility.
---
 -- The specified item may be a group.  In that case, the group will be
 -- represented by some item in the group, along with a flag indicating
 -- that it's a group.  If the group contains only one item, it will be
@@ -202,7 +195,7 @@ local function stack_image_button(x, y, w, h, buttonname_prefix, item)
 	local name = item:get_name()
 	local count = item:get_count()
 	local show_is_group = false
-	local displayitem = name
+	local displayitem = name.." "..count
 	local selectitem = name
 	if name:sub(1, 6) == "group:" then
 		local group_name = name:sub(7)
@@ -211,18 +204,30 @@ local function stack_image_button(x, y, w, h, buttonname_prefix, item)
 		displayitem = group_item.item or "unknown"
 		selectitem = group_item.sole and displayitem or name
 	end
-	local label = string.format("\n\n%s%7d", show_is_group and "  G\n" or "  ", count):gsub(" 1$", " .")
-	if label == "\n\n        ." then label = "" end
-	return string.format("item_image_button[%f,%f;%u,%u;%s;%s;%s]",
+	local label = show_is_group and "G" or ""
+	local buttonname = minetest.formspec_escape(buttonname_prefix..unified_inventory.mangle_for_formspec(selectitem))
+	local button = string.format("item_image_button[%f,%f;%f,%f;%s;%s;%s]",
 			x, y, w, h,
-			minetest.formspec_escape(displayitem),
-			minetest.formspec_escape(buttonname_prefix..unified_inventory.mangle_for_formspec(selectitem)),
-			label)
+			minetest.formspec_escape(displayitem), buttonname, label)
+	if show_is_group then
+		local groupstring, andcount = unified_inventory.extract_groupnames(name)
+		local grouptip
+		if andcount == 1 then
+			grouptip = string.format(S("Any item belonging to the %s group"), groupstring)
+		elseif andcount > 1 then
+			grouptip = string.format(S("Any item belonging to the groups %s"), groupstring)
+		end
+		grouptip = minetest.formspec_escape(grouptip)
+		if andcount >= 1 then
+			button = button  .. string.format("tooltip[%s;%s]", buttonname, grouptip)
+		end
+	end
+	return button
 end
 
 local recipe_text = {
-	recipe = "Recipe",
-	usage = "Usage",
+	recipe = "Recipe %d of %d",
+	usage = "Usage %d of %d",
 }
 local no_recipe_text = {
 	recipe = "No recipes",
@@ -232,6 +237,14 @@ local role_text = {
 	recipe = "Result",
 	usage = "Ingredient",
 }
+local next_alt_text = {
+	recipe = "Show next recipe",
+	usage = "Show next usage",
+}
+local prev_alt_text = {
+	recipe = "Show previous recipe",
+	usage = "Show previous usage",
+}
 local other_dir = {
 	recipe = "usage",
 	usage = "recipe",
@@ -249,7 +262,7 @@ unified_inventory.register_page("craftguide", {
 		local player_privs = minetest.get_player_privs(player_name)
 		local formspec = ""
 		formspec = formspec.."background[0,"..(formspecy + 3.5)..";8,4;ui_main_inventory.png]"
-		formspec = formspec.."label[0,"..formheadery..";" .. S("Crafting Guide") .. "]"
+		formspec = formspec.."label[0,"..formheadery..";" .. F("Crafting Guide") .. "]"
 		formspec = formspec.."listcolors[#00000000;#00000000]"
 		local item_name = unified_inventory.current_item[player_name]
 		if not item_name then return {formspec=formspec} end
@@ -268,20 +281,20 @@ unified_inventory.register_page("craftguide", {
 
 		formspec = formspec.."background[0.5,"..(formspecy + 0.2)..";8,3;ui_craftguide_form.png]"
 		formspec = formspec.."textarea["..craftresultx..","..craftresulty
-                           ..";10,1;;"..minetest.formspec_escape(role_text[dir]..": "..item_name)..";]"
+                           ..";10,1;;"..minetest.formspec_escape(F(role_text[dir])..": "..item_name)..";]"
 		formspec = formspec..stack_image_button(0, formspecy, 1.1, 1.1, "item_button_"
 		                   .. rdir .. "_", ItemStack(item_name))
 
 		if not craft then
 			formspec = formspec.."label[5.5,"..(formspecy + 2.35)..";"
-			                   ..minetest.formspec_escape(no_recipe_text[dir]).."]"
+			                   ..minetest.formspec_escape(F(no_recipe_text[dir])).."]"
 			local no_pos = dir == "recipe" and 4.5 or 6.5
 			local item_pos = dir == "recipe" and 6.5 or 4.5
 			formspec = formspec.."image["..no_pos..","..formspecy..";1.1,1.1;ui_no.png]"
 			formspec = formspec..stack_image_button(item_pos, formspecy, 1.1, 1.1, "item_button_"
 			                   ..other_dir[dir].."_", ItemStack(item_name))
 			if player_privs.give == true then
-				formspec = formspec.."label[0,"..(formspecy + 2.10)..";" .. S("Give me:") .. "]"
+				formspec = formspec.."label[0,"..(formspecy + 2.10)..";" .. F("Give me:") .. "]"
 						.."button[0,  "..(formspecy + 2.7)..";0.6,0.5;craftguide_giveme_1;1]"
 						.."button[0.6,"..(formspecy + 2.7)..";0.7,0.5;craftguide_giveme_10;10]"
 						.."button[1.3,"..(formspecy + 2.7)..";0.8,0.5;craftguide_giveme_99;99]"
@@ -301,45 +314,76 @@ unified_inventory.register_page("craftguide", {
 
 		-- This keeps recipes aligned to the right,
 		-- so that they're close to the arrow.
-		local xoffset = 1.5 + (3 - display_size.width)
+		local xoffset = 5.5
+		-- Offset factor for crafting grids with side length > 4
+		local of = (3/math.max(3, math.max(display_size.width, display_size.height)))
+		local od = 0
+		-- Minimum grid size at which size optimazation measures kick in
+		local mini_craft_size = 6
+		if display_size.width >= mini_craft_size then
+			od = math.max(1, display_size.width - 2)
+			xoffset = xoffset - 0.1
+		end
+		-- Size modifier factor
+		local sf = math.min(1, of * (1.05 + 0.05*od))
+		-- Button size
+		local bsize_h = 1.1 * sf
+		local bsize_w = bsize_h
+		if display_size.width >= mini_craft_size then
+			bsize_w = 1.175 * sf
+		end
+		if (bsize_h > 0.35 and display_size.width) then
 		for y = 1, display_size.height do
 		for x = 1, display_size.width do
 			local item
 			if craft and x <= craft_width then
 				item = craft.items[(y-1) * craft_width + x]
 			end
+			-- Flipped x, used to build formspec buttons from right to left
+			local fx = display_size.width - (x-1)
+			-- x offset, y offset
+			local xof = (fx-1) * of + of
+			local yof = (y-1) * of + 1
 			if item then
 				formspec = formspec..stack_image_button(
-						xoffset + x, formspecy - 1 + y, 1.1, 1.1,
+						xoffset - xof, formspecy - 1 + yof, bsize_w, bsize_h,
 						"item_button_recipe_",
 						ItemStack(item))
 			else
 				-- Fake buttons just to make grid
 				formspec = formspec.."image_button["
-					..tostring(xoffset + x)..","..tostring(formspecy - 1 + y)
-					..";1,1;ui_blank_image.png;;]"
+					..tostring(xoffset - xof)..","..tostring(formspecy - 1 + yof)
+					..";"..bsize_w..","..bsize_h..";ui_blank_image.png;;]"
 			end
 		end
 		end
+		else
+			-- Error
+			formspec = formspec.."label["
+				..tostring(2)..","..tostring(formspecy)
+				..";"..minetest.formspec_escape(S("This recipe is too\nlarge to be displayed.")).."]"
+		end
 
-		if craft_type.uses_crafting_grid then
-			formspec = formspec.."label[0,"..(formspecy + 0.9)..";" .. S("To craft grid:") .. "]"
+		if craft_type.uses_crafting_grid and display_size.width <= 3 then
+			formspec = formspec.."label[0,"..(formspecy + 0.9)..";" .. F("To craft grid:") .. "]"
 					.."button[0,  "..(formspecy + 1.5)..";0.6,0.5;craftguide_craft_1;1]"
 					.."button[0.6,"..(formspecy + 1.5)..";0.7,0.5;craftguide_craft_10;10]"
-					.."button[1.3,"..(formspecy + 1.5)..";0.8,0.5;craftguide_craft_max;" .. S("All") .. "]"
+					.."button[1.3,"..(formspecy + 1.5)..";0.8,0.5;craftguide_craft_max;" .. F("All") .. "]"
 		end
 		if player_privs.give then
-			formspec = formspec.."label[0,"..(formspecy + 2.1)..";" .. S("Give me:") .. "]"
+			formspec = formspec.."label[0,"..(formspecy + 2.1)..";" .. F("Give me:") .. "]"
 					.."button[0,  "..(formspecy + 2.7)..";0.6,0.5;craftguide_giveme_1;1]"
 					.."button[0.6,"..(formspecy + 2.7)..";0.7,0.5;craftguide_giveme_10;10]"
 					.."button[1.3,"..(formspecy + 2.7)..";0.8,0.5;craftguide_giveme_99;99]"
 		end
 
 		if alternates and alternates > 1 then
-			formspec = formspec.."label[5.5,"..(formspecy + 1.6)..";"..recipe_text[dir].." "
-					..tostring(alternate).." of "
-					..tostring(alternates).."]"
-					.."button[5.5,"..(formspecy + 2)..";2,1;alternate;" .. S("Alternate") .. "]"
+			formspec = formspec.."label[5.5,"..(formspecy + 1.6)..";"
+					..string.format(F(recipe_text[dir]), alternate, alternates).."]"
+					.."image_button[5.5,"..(formspecy + 2)..";1,1;ui_left_icon.png;alternate_prev;]"
+					.."image_button[6.5,"..(formspecy + 2)..";1,1;ui_right_icon.png;alternate;]"
+					.."tooltip[alternate_prev;"..F(prev_alt_text[dir]).."]"
+					.."tooltip[alternate;"..F(next_alt_text[dir]).."]"
 		end
 		return {formspec = formspec}
 	end,
diff --git a/mods/unified_inventory/screenshot.png b/mods/unified_inventory/screenshot.png
new file mode 100644
index 00000000..972cbb46
Binary files /dev/null and b/mods/unified_inventory/screenshot.png differ
diff --git a/mods/unified_inventory/textures/ui_reset_icon.png b/mods/unified_inventory/textures/ui_reset_icon.png
new file mode 100644
index 00000000..882fdae2
Binary files /dev/null and b/mods/unified_inventory/textures/ui_reset_icon.png differ
diff --git a/mods/unified_inventory/waypoints.lua b/mods/unified_inventory/waypoints.lua
index 4e99d75f..c6f23522 100755
--- a/mods/unified_inventory/waypoints.lua
+++ b/mods/unified_inventory/waypoints.lua
@@ -1,4 +1,5 @@
 local S = unified_inventory.gettext
+local F = unified_inventory.fgettext
 
 local hud_colors = {
 	{"#FFFFFF", 0xFFFFFF, S("White")},
@@ -24,7 +25,7 @@ unified_inventory.register_page("waypoints", {
 		local waypoints = datastorage.get(player_name, "waypoints")
 		local formspec = "background[0,4.5;8,4;ui_main_inventory.png]" ..
 			"image[0,0;1,1;ui_waypoints_icon.png]" ..
-			"label[1,0;" .. S("Waypoints") .. "]"
+			"label[1,0;" .. F("Waypoints") .. "]"
 
 		-- Tabs buttons:
 		for i = 1, 5, 1 do
@@ -34,13 +35,13 @@ unified_inventory.register_page("waypoints", {
 				"ui_" .. i .. "_icon.png;" ..
 				"select_waypoint" .. i .. ";]" ..
 				"tooltip[select_waypoint" .. i .. ";"
-					.. minetest.formspec_escape(S("Select Waypoint #%d"):format(i)).."]"
+					.. (S("Select Waypoint #%d"):format(i)).."]"
 		end
 
 		local i = waypoints.selected or 1
 		local waypoint = waypoints[i] or {}
 		local temp = waypoints_temp[player_name][i] or {}
-		local default_name = "Waypoint "..i
+		local default_name = string.format(S("Waypoint %d"), i)
 
 		-- Main buttons:
 		formspec = formspec ..
@@ -48,43 +49,43 @@ unified_inventory.register_page("waypoints", {
 			"ui_waypoint_set_icon.png;"..
 			"set_waypoint"..i..";]"..
 			"tooltip[set_waypoint" .. i .. ";"
-				.. minetest.formspec_escape(S("Set waypoint to current location")).."]"
+				.. F("Set waypoint to current location").."]"
 
 		formspec = formspec ..
 			"image_button[5.2,3.7;.8,.8;"..
 			(waypoint.active and "ui_on_icon.png" or "ui_off_icon.png")..";"..
 			"toggle_waypoint"..i..";]"..
 			"tooltip[toggle_waypoint" .. i .. ";"
-				.. minetest.formspec_escape(S("Make waypoint "
-					..(waypoint.active and "invisible" or "visible"))).."]"
+				.. F("Make waypoint "
+					..(waypoint.active and "invisible" or "visible")).."]"
 
 		formspec = formspec ..
 			"image_button[5.9,3.7;.8,.8;"..
 			(waypoint.display_pos and "ui_green_icon_background.png" or "ui_red_icon_background.png").."^ui_xyz_icon.png;"..
 			"toggle_display_pos" .. i .. ";]"..
 			"tooltip[toggle_display_pos" .. i .. ";"
-				.. minetest.formspec_escape(S((waypoint.display_pos and "Disable" or "Enable")
-					.." display of waypoint coordinates")).."]"
+				.. F((waypoint.display_pos and "Disable" or "Enable")
+					.." display of waypoint coordinates").."]"
 
 		formspec = formspec ..
 			"image_button[6.6,3.7;.8,.8;"..
 			"ui_circular_arrows_icon.png;"..
 			"toggle_color"..i..";]"..
 			"tooltip[toggle_color" .. i .. ";"
-				.. minetest.formspec_escape(S("Change color of waypoint display")).."]"
+				.. F("Change color of waypoint display").."]"
 
 		formspec = formspec ..
 			"image_button[7.3,3.7;.8,.8;"..
 			"ui_pencil_icon.png;"..
 			"rename_waypoint"..i..";]"..
 			"tooltip[rename_waypoint" .. i .. ";"
-				.. minetest.formspec_escape(S("Edit waypoint name")).."]"
+				.. F("Edit waypoint name").."]"
 
 		-- Waypoint's info:
 		if waypoint.active then
-			formspec = formspec .. 	"label[1,0.8;"..S("Waypoint active").."]"
+			formspec = formspec .. 	"label[1,0.8;"..F("Waypoint active").."]"
 		else
-			formspec = formspec .. 	"label[1,0.8;"..S("Waypoint inactive").."]"
+			formspec = formspec .. 	"label[1,0.8;"..F("Waypoint inactive").."]"
 		end
 
 		if temp.edit then
@@ -95,13 +96,13 @@ unified_inventory.register_page("waypoints", {
 				"ui_ok_icon.png;"..
 				"confirm_rename"..i.. ";]"..
 				"tooltip[confirm_rename" .. i .. ";"
-					.. minetest.formspec_escape(S("Finish editing")).."]"
+					.. F("Finish editing").."]"
 		end
 
-		formspec = formspec .. "label[1,1.3;"..S("World position")..": " ..
+		formspec = formspec .. "label[1,1.3;"..F("World position")..": " ..
 			minetest.pos_to_string(waypoint.world_pos or vector.new()) .. "]" ..
-			"label[1,1.8;"..S("Name")..": ".. (waypoint.name or default_name) .. "]" ..
-			"label[1,2.3;"..S("HUD text color")..": " ..
+			"label[1,1.8;"..F("Name")..": ".. (waypoint.name or default_name) .. "]" ..
+			"label[1,2.3;"..F("HUD text color")..": " ..
 			hud_colors[waypoint.color or 1][3] .. "]"
 
 		return {formspec=formspec}