Merge from Gui3D and changed tab style