UI refinements - trying to improve performance of show/hide