Front End Module Editing Fixes #2521