Enh: Improved journal management, added cross-links