Tidy up the DIY forms section for existing forms

Allow the forms to be moved into subfolders, for example by income stream or department

Look and Feel