refactored component

FE completed ...