Small fixes

Merging new objects instead of saving to allow partial changes
Added a favicon so that it stops making requests for it, triggering a bad DB lookup
Added a placeholder if there is no HTML yet