Simplify the "Estimateion plan" map and "Associate module" pages: refs #466
Commit after Merge and solving conflicts: refs #466