Added dummy data / highest marker and fixed draw issues