UI clean up part 3 + bug fixes