GUI update, talrijke bugfixes
GUI merge conflict resolved