fix layout
merged with knott