change visibility popUp
change visibility popUp
Merged master fixed conflict.
fix var name