small changes in the lib and layouts