improve stuff for mobile