Cleanup config collector
Seperate assets and tweak interface