finished up most of the ui