[layout] close #24