cleaned up useless "else if(){setVisible} stuff (see last 2 commits)