Remove Close Button
Renamed function + added container check