Cleaned up the Module UI
Cleaned up the Module UI