working on favorites button
added non-functioning slider
slider
resolved merge conflicts