Cleaned up dashboard and colors
Merge new homepage