fix component structure and tested with running instance