Small improvements to HomeMenu & ApplyChecker