Refactor form topics to sections