Added a few changes for mobile