Added some optimisations for mobile viewing