Improve modules section with mark calculator