Improvements to GUI
Improve scripts