combined pages
merging dashboard and history