Merge gui to develop 3.0 branch