Converted to FP component
Removed lables from FP