Dashboard styling coming along
Fixed merge conflicts