Working on the UI of the module.
Apply fixes and chages.