Fixed title and javascript:void() errors, moved to subtable format