favorite view added, code clean up & organization needed