Revert "Put settings in data-container"

This reverts commit ae97c6f3b8b0c320d80759c810bae693694505ea.