added dashboard view
merge + fix dashboard view