Revert "Show/Hide Logic"

This reverts commit aba0bce8acb4b12c4504312f84bcb415f34c3b63.