Fix distance calculation
Tweak styles