GUUI cleanup
GUI. All functions should now be properly wrapped.
ERT-46 GUI
ERT-47 GUI. Some more fixes