improving the ui with the last edits