Working on the ui