formatting fix + bug fix in component
PR Changes
Conflict
Merge