Added new markers, and fixed the design a bit