diff --git a/L2J_DataPack_BETA/dist/game/config/adminCommands.xml b/L2J_DataPack_BETA/dist/game/config/adminCommands.xml
index 111eb73936e1fe7fe845936614f3be7646d74fa2..3bbc97f56886dcfffe2910465edd96d25379b4de 100644
--- a/L2J_DataPack_BETA/dist/game/config/adminCommands.xml
+++ b/L2J_DataPack_BETA/dist/game/config/adminCommands.xml
@@ -152,17 +152,6 @@
 	<admin command="admin_set_mp" accessLevel="7" />
 	<admin command="admin_set_cp" accessLevel="7" />
 
-	<!-- ADMIN EDIT NPC -->
-	<admin command="admin_edit_npc" accessLevel="7" />
-	<admin command="admin_save_npc" accessLevel="7" />
-	<admin command="admin_show_skill_list_npc" accessLevel="7" />
-	<admin command="admin_add_skill_npc" accessLevel="7" />
-	<admin command="admin_del_skill_npc" accessLevel="7" />
-	<admin command="admin_show_drop_list" accessLevel="7" />
-	<admin command="admin_add_drop" accessLevel="7" />
-	<admin command="admin_del_drop" accessLevel="7" />
-	<admin command="admin_log_npc_spawn" accessLevel="7" />
-
 	<!-- ADMIN EFFECTS -->
 	<admin command="admin_invis" accessLevel="7" />
 	<admin command="admin_invisible" accessLevel="7" />
diff --git a/L2J_DataPack_BETA/dist/game/data/html/admin/npc-quests.htm b/L2J_DataPack_BETA/dist/game/data/html/admin/npc-quests.htm
index 6a97324a7201522af28c317ff2cd4a7e78e2d239..b9cab406c8259ade90df2865f7a0376eda46d894 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/admin/npc-quests.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/admin/npc-quests.htm
@@ -8,10 +8,10 @@
 <td><button value="Buffs" action="bypass admin_getbuffs" width=60 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
 </tr>
 <tr>
-<td><button value="Edit" action="bypass admin_edit_npc stats %tmplid%" width=60 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td><button value="Skills" action="bypass admin_show_skill_list_npc %tmplid%" width=60 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td><button value="Drop" action="bypass admin_show_drop_list %tmplid%" width=60 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
 <td><button value="Quests" action="bypass admin_show_quests %tmplid%" width=60 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td><button value="NpcViewMod" action="bypass NpcViewMod view %objid%" width=60 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td></td>
+<td></td>
 </tr>
 </table>
 <br><img src="L2UI.SquareWhite" width=260 height=1><br>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminQuest.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminQuest.java
index 3539473c5b9e681e5c953a92cedad8e5b7ae0e7f..21db59f06c877bab187709e3dcf83bec3035f8cc 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminQuest.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminQuest.java
@@ -212,6 +212,7 @@ public class AdminQuest implements IAdminCommandHandler
 					}
 				}
 				msg.replace("%quests%", sb.toString());
+				msg.replace("%objid%", npc.getObjectId());
 				msg.replace("%tmplid%", Integer.toString(npc.getTemplate().getId()));
 				msg.replace("%questName%", "");
 				activeChar.sendPacket(msg);