fixing dashboard view
fixed merge conflict