Some modifications on usercontroller and section management.
Merge origin/master