Implemented favoriting and cleaned up views