Fixed bugs after merge, but I reverted notifications.views back to pre-merge state.