some changes

fixed bundle step,
calling general form for every component,
changed isset to is_array