Updated

Dashboard almost done, missing only Charts