Fill viewport better