A few more optimizations and mobile ready.