Added checkmarks and other stuff