Renamed layer constants.  Adjusted various distances.