Unify web handler() structure

[jackjansen]

There's been a sort-of half-assed attempt at structuring all of these the same way. Let's finish that.