responsive dashboard
merge conflict