One more cookie fix
Cleaning up html
Merge branch 'chris'
Fixing zip page more