formatting fix + bug fix in component