Revert "Revert "Fixing visual updates""

This reverts commit ef325719c0c97e37947633b7318f42b5297b9ffb.