Added viewport and scaling