Reverted some previous changes didn't work on mobile