Create dashboard
Fix bugs due to merging