Mostly optimizations and making mobile friendly