Re-organise settings

Settings are more logically distributed now.