diff --git a/NPSimulation/Simulation.cc b/NPSimulation/Simulation.cc
index e54782db2b99dfe8f18d30ea6f276db33e67e80d..3c68b67c76313aef6a58aab04936b8d5c238332d 100644
--- a/NPSimulation/Simulation.cc
+++ b/NPSimulation/Simulation.cc
@@ -97,19 +97,22 @@ int main(int argc, char** argv){
///////////////////////////////////////////////////////////////
// interactive mode : define UI session
// Get the pointer to the User Interface manager
+ G4cout << "//////////// Starting UI ////////////"<< endl;
G4UImanager* UImanager = G4UImanager::GetUIpointer();
- cout << UImanager->GetVerboseLevel() << endl ;
#ifdef G4UI_USE
G4UIExecutive* ui = new G4UIExecutive(argc, argv);
#ifdef G4VIS_USE
+ UImanager->ApplyCommand("/control/execute macro/aliases.mac");
G4VisManager* visManager = new G4VisExecutive("Quiet");
visManager->Initialize();
- UImanager->ApplyCommand("/control/execute vis.mac");
+ UImanager->ApplyCommand("/control/execute macro/vis.mac");
#endif
- if (ui->IsGUI())
- UImanager->ApplyCommand("/control/execute gui.mac");
- ui->SessionStart();
- delete ui;
+ if (ui->IsGUI()){
+ UImanager->ApplyCommand("/control/execute macro/gui.mac");
+ }
+
+ ui->SessionStart();
+ delete ui;
#endif
#ifdef G4VIS_USE
diff --git a/NPSimulation/gui.mac b/NPSimulation/gui.mac
deleted file mode 100644
index 1bed7bd6911fc28c4e45a0aa73bd9f5232e2aed1..0000000000000000000000000000000000000000
--- a/NPSimulation/gui.mac
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# This file permits to customize, with commands,
-# the menu bar of the G4UIXm, G4UIQt, G4UIWin32 sessions.
-# It has no effect with G4UIterminal.
-#
-# File
-#
-#
-
-# Viewer menu :
-/gui/addMenu viewer Viewer
-/gui/addButton viewer "New viewer" "/control/execute vis.mac"
-/gui/addButton viewer "Set style surface" "/vis/viewer/set/style surface"
-/gui/addButton viewer "Set style wireframe" "/vis/viewer/set/style wireframe"
-
-/gui/addMenu tracking Tracking
-/gui/addButton tracking "Set Tracking verbose" "/tracking/verbose"
-
-/gui/addMenu run Run
-/gui/addButton run "Run beam on" "/run/beamOn"
-
-/gui/addMenu custom "Custom View"
-/gui/addButton custom "Add Axis" "/vis/scene/add/axes"
-/gui/addButton custom "Add Beam axis" "/vis/scene/add/arrow 0 0 -1 0 0 1 m"
-/gui/addButton custom "Add Scorer Hits" "/vis/scene/add/psHits"
-/gui/addButton custom "Add Hits" "/vis/scene/add/hits"
-/gui/addButton custom "Add Event ID" "/vis/scene/add/eventID"
-
-/gui/addIcon "Exit" user_icon "exit" icons/power.png
-/gui/addIcon "There is nothing here" user_icon "/" icons/empty.png
-/gui/addIcon "Run beam on" user_icon "/run/beamOn" icons/rocket.png
-/gui/addIcon "One event" user_icon "/run/beamOn 1" icons/play.png
-/gui/addIcon "Seriously?" user_icon "/" icons/empty.png
-/gui/addIcon "Activate tracking verbose" user_icon "/tracking/verbose 1" icons/shoeprints.png
-/gui/addIcon "Only borring emptyness" user_icon "/" icons/empty.png
-/gui/addIcon "Home" user_icon "/vis/viewer/set/viewpointThetaPhi 45. 45." icons/videocameraclassic.png
-/gui/addIcon "Front" user_icon "/vis/viewer/set/viewpointThetaPhi 0. 0." icons/arrow-up.png
-/gui/addIcon "Back" user_icon "/vis/viewer/set/viewpointThetaPhi 180. 0." icons/arrow-down.png
-/gui/addIcon "Left" user_icon "/vis/viewer/set/viewpointThetaPhi 90. 0." icons/arrow-left.png
-/gui/addIcon "Right" user_icon "/vis/viewer/set/viewpointThetaPhi -90. 0." icons/arrow-right.png
-/gui/addIcon "Zoom in" user_icon "/vis/viewer/zoom 2" icons/zoomin.png
-/gui/addIcon "Zoom out" user_icon "/vis/viewer/zoom 0.5" icons/zoomout.png
-
diff --git a/NPSimulation/macro/aliases.mac b/NPSimulation/macro/aliases.mac
new file mode 100644
index 0000000000000000000000000000000000000000..33d4a9eb195214b7e70d316207bb3b3c71f188fd
--- /dev/null
+++ b/NPSimulation/macro/aliases.mac
@@ -0,0 +1,18 @@
+# Aliases are needed to avoid warning
+/control/alias gui_beamon "/run/beamOn 1"
+/control/alias gui_vis "/control/execute vis.mac "
+/control/alias gui_tracking "/tracking/verbose 1"
+/control/alias gui_surface "/vis/viewer/set/style surface"
+/control/alias gui_wireframe "/vis/viewer/set/style wireframe"
+/control/alias gui_beam "/vis/scene/add/arrow 0 0 -1 0 0 1 m"
+/control/alias gui_home "/vis/viewer/set/viewpointThetaPhi 45. 45."
+/control/alias gui_front "/vis/viewer/set/viewpointThetaPhi 0. 0."
+/control/alias gui_back "/vis/viewer/set/viewpointThetaPhi 180. 0."
+/control/alias gui_left "/vis/viewer/set/viewpointThetaPhi 90. 0."
+/control/alias gui_right "/vis/viewer/set/viewpointThetaPhi -90. 0."
+/control/alias gui_zoomin "/vis/viewer/zoom 2"
+/control/alias gui_zoomout "/vis/viewer/zoom 0.5"
+/control/alias gui_empty "/"
+/control/alias gui_exit "exit"
+
+
diff --git a/NPSimulation/macro/gui.mac b/NPSimulation/macro/gui.mac
new file mode 100644
index 0000000000000000000000000000000000000000..45c92454b4dc9305115239dde6407092b1d40bfb
--- /dev/null
+++ b/NPSimulation/macro/gui.mac
@@ -0,0 +1,41 @@
+#
+# This file permits to customize, with commands,
+# the menu bar of the G4UIXm, G4UIQt, G4UIWin32 sessions.
+# It has no effect with G4UIterminal.
+#
+# File
+#
+#
+# Viewer menu :
+/gui/addMenu viewer Viewer
+/gui/addButton viewer "New viewer" "{gui_vis}"
+/gui/addButton viewer "Set style surface" "{gui_surface}"
+/gui/addButton viewer "Set style wireframe" "{gui_wireframe}"
+
+/gui/addMenu tracking Tracking
+/gui/addButton tracking "Set Tracking verbose" "/tracking/verbose"
+
+/gui/addMenu run Run
+/gui/addButton run "Run beam on" "/run/beamOn"
+
+/gui/addMenu custom "Custom View"
+/gui/addButton custom "Add Axis" "/vis/scene/add/axes"
+/gui/addButton custom "Add Beam axis" "{gui_beam}"
+/gui/addButton custom "Add Scorer Hits" "/vis/scene/add/psHits"
+/gui/addButton custom "Add Hits" "/vis/scene/add/hits"
+/gui/addButton custom "Add Event ID" "/vis/scene/add/eventID"
+
+/gui/addIcon "Exit" user_icon "{gui_exit}" icons/power.png
+/gui/addIcon "There is nothing here" user_icon "{gui_empty}" icons/empty.png
+/gui/addIcon "Run beam on" user_icon "/run/beamOn" icons/rocket.png
+/gui/addIcon "One event" user_icon "{gui_beamon}" icons/play.png
+/gui/addIcon "Activate tracking verbose" user_icon "{gui_tracking}" icons/shoeprints.png
+/gui/addIcon "Only borring emptyness" user_icon "{gui_empty}" icons/empty.png
+/gui/addIcon "Home" user_icon "{gui_home}" icons/videocameraclassic.png
+/gui/addIcon "Front" user_icon "{gui_front}" icons/arrow-up.png
+/gui/addIcon "Back" user_icon "{gui_back}" icons/arrow-down.png
+/gui/addIcon "Left" user_icon "{gui_left}" icons/arrow-left.png
+/gui/addIcon "Right" user_icon "{gui_right}" icons/arrow-right.png
+/gui/addIcon "Zoom in" user_icon "{gui_zoomin}" icons/zoomin.png
+/gui/addIcon "Zoom out" user_icon "{gui_zoomout}" icons/zoomout.png
+
diff --git a/NPSimulation/vis.mac b/NPSimulation/macro/vis.mac
similarity index 97%
rename from NPSimulation/vis.mac
rename to NPSimulation/macro/vis.mac
index 0571566bbd2b486550caa02102b002c9ac6ce7b8..26cde590f90142bf12120641a44a788f63a97dde 100644
--- a/NPSimulation/vis.mac
+++ b/NPSimulation/macro/vis.mac
@@ -4,8 +4,10 @@
# Sets some default verbose
#
/control/verbose 0
-/control/saveHistory
/run/verbose 0
+/cuts/verbose 0
+/process/em/verbose 0
+/process/eLoss/verbose 0
#
# Use this open statement to create an OpenGL view:
/vis/open OGLI 1200x600-0+0
diff --git a/NPSimulation/vasigamma.mac b/NPSimulation/vasigamma.mac
deleted file mode 100644
index de894f95f8019d4bbfadfec8ec921defa60176e7..0000000000000000000000000000000000000000
--- a/NPSimulation/vasigamma.mac
+++ /dev/null
@@ -1,27 +0,0 @@
-#verbose level
-/control/verbose 0
-/material/verbose 0
-/tracking/verbose 0
-/process/verbose 0
-/event/verbose 0
-/run/verbose 0
-
-# choose a graphic system
-#/vis/open OGLIX
-#/vis/open OGLSX
-#/vis/open VRML2FILE
-#/vis/scene/create
-#/vis/drawVolume
-#/vis/viewer/set/viewpointThetaPhi 0 0 deg
-#/vis/viewer/zoom 7
-
-# options to draw trajectories
-#/vis/scene/endOfEventAction accumulate
-#/vis/scene/add/trajectories 1
-#/tracking/storeTrajectory 1
-#/vis/scene/add/axes 0 0 0 20 cm
-#/vis/viewer/refresh
-
-# run event
-/run/beamOn 100000
-