UI clean up part 2