Fixes - make this work on mobile and stuff