Fixed viewport issues