Rename view hook in content form and remove uneccesary fieldset tags when no hooks are present