some more layout, needs a refactoring