ReCommit: HomeMenu, TPA/TE

Recommiting because of a conflict.