Second time: move to fieldset
Merge pull request #18 from SU-SWS/7.x-3.x-SSP-86-2

Second time: move to fieldset