Refractored UI stuff into Ui-module