final commit for the ui