Cleanup config;
Rework contexts; update UI creation;