Added some partials / fix for mobile