Include missing files in the layout, fix issues in the dashboard module