Code cleanup
Implemented favorites list