minor ui changes plus clean-up part 2