Correctly remember showing of fields
Add missing label tag