UI clean up part 1