Added Distance Button - part 1
Merge origin/master
Fixed formatting for various differences