#41 improved layout