fixed null pointer and added new and popular views