Added id to fieldset and fixed fieldset rendering bug