Fixed outline bug
Added new field types