update lib and fix layout