Add current page helper
Start to clean up args passed to helpers