Reduce diffusion to a single effect entry
Improve swirl form layout and text
Reorganize menus a bit