Add a basic dashboard page and route
Add dashboard layout file
Fix merge conflict