updated component
unified config & some other fixes