UI fixed, and modules edited