Little fixes & new component

Little fixes & new component