fixed bug in loading of dashboardbean
merged files
adjusted some of the dashboard functionality