Fix to synchronized viewing button events