Added latest changes to the module UI and performed code clean up