Added Dashboard + cleaned

Added Dashboard + cleaned