Added My Entries View
fix merge conflict