Second iteration of the ui