Simplify and improve mobile