added stream, fixed favorites styling
made favorites work, added stream, merged