add module management, and change presentation style
fix merge conflict