Bugfix + new sections controls implementation