working on fixes for mobile