More UI fixes, show/hide in DOM