Fix table layout (relates to #12)