home & layout template revised
Merge remote-tracking branch 'origin/logintest' into logintest