Add missing config options, fix default values and layout