Refactoring message handling
Minor comment changes
Resolve anchors in content
Messing with default display settings
Cleaner message handling