Updated a number of settings to deal with layout and script usage.