Improved structure of dashboard.html