Fix process on mobile and tablet, cleanup