Major changes into the ui module