clean up ui part 1