clean up templates; move export to account page