Issue refs #1529: done (in home module), fixed for new module layout