Some styling changes, added distances for all types