basic dashboard page
merge conflicts