update pool and fix layout