#314 Added custom views hook to modify the joins, changed subscription views to work more properly, rerolled subscription view