Dashboard stuff
t
Add categories
fix conflicts