added more firebase functionality and comsolidated two subscription views into one another