Move payload parsing into helper
Smarter index page