Convert logon to use modern markup with inlinefield macros.

A good example of inlinefield macro usage with manual in-template field objects.