Fixed icons, added required,, added type checking