made more progress on the ui