Many updates mostly to the mobile version