Misc changes

Fixed subscribe bug, added more features to content filtering, chose
better names for some files, reworked parts of options UI