Fix expanding bar viewport issues!