Updated flex form
Added some labels