Mbile commits
Mobile optimization + bug fix