Added more support for mobile browsing