Mostly finished dashboard snippet some bug fixes