Merge of "fix mobile bug that was borking the page"