Handle VP counter updating more elegantly
Fix bug that makes VP counter always hidden