Made dashboard pretty...fuckin awesome
Fixed merge conflict