More corrections to the mobile and table layouts