Fixed SafeLabel bug; Added subheader;

Was dynamically creating safeLabel instead of using the json version,
which may need to be manipulated manually in case you have fields using
the same label(name).