tweaks to logon form, more structure