Small layout changes, config options, data providers, small fixes