fixed last breaking test, further improved layout (not yet finished)