added simple list view to dashboard
fixed merge conflicts