Added more mobile optimizations