Created Form Component, moved more elements from bundle to Option Component