A few fixes.
Added toggling functionality to fields.