Cleanup after the previous changes

Moved hyperlink margin/etc. to a XAML style, added reminders for future
fixes, some minor reorganization and safety checks