Fixing bugs appearing on mobile