Modify GUI Action
merge code from master