Tidy up login page to use annotations.
Project miscellany mods.