More showing and hiding fixes.