Mobile and desktop fix WIP