Fix moble viewing issue & add analytics