CK table and links fix