#24 fix layout issues