Fixes/Optimizations

Combines dashboard files
Cleaned out the sql queries
added some stuff