Web config

Lots of web config and general config refactoring