re-organize hide/show conditionals