Visibility displays
Reorganizing visibility classes