fix layout add some tests