Clean up markup
Add Payoff content page id setting
Fix @If