Add environment specific config & refactor UI
Refactor UI