Refactor mobile scroll fix directly into layer