Moved addrule and hosts views to index and made them selectively visible.
Fixed conflicts.

Apparently, I stupidly forgot to 'git pull' before making a ton of changes.