Finish work on UI