Cleaning up. Fixing mobile rendering issues