Improvements

Logon UI improved. Word add/edit start to be rule based.