Temp short viewport fix
Optimised build