Fixed Link messages, moved link messages to  table.