Fix for mobiles and simplify a bit more the design