finished first half of the ui update