Visibility improvements