Fix bug in adding a sub container
Fixed events buttons
Tidy