Clues grouped together, cleaned up HTML, messages working again