sections controller + views
manual merge