Finish general UI and logic