Changes for display/hide

Changes for display/hide some elements that interfere with other add-on
functions